Minor drivers/xen changes and includes to support xenlinux/ia64

diff --git a/linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c b/linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c
index 3f32baa895adfa647c3a1a1335b9d4a55aaf30ae..4377aa58897293e90bdf867841bad622ef00541b 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c
+++ b/linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c
@@ -14,6 +14,7 @@
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <asm/pgtable.h>
+#include <asm-xen/xen-public/xen.h>
 #include <asm/fixmap.h>
 #include <asm/uaccess.h>
 #include <asm-xen/xen_proc.h>
@@ -435,6 +436,9 @@ gnttab_init(void)
 {
     int i;
 
+    if (xen_init() < 0)
+        return -ENODEV;
+
     BUG_ON(gnttab_resume());
 
     shared = (grant_entry_t *)fix_to_virt(FIX_GNTTAB_END);

diff --git a/linux-2.6-xen-sparse/drivers/xen/console/console.c b/linux-2.6-xen-sparse/drivers/xen/console/console.c
index c18a0c00b2288e64c8ae2e8f60be59af20def604..1206e4ea6a18bc8f4bf2664152a621080cb6bb24 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/console/console.c
+++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c
@@ -691,6 +691,9 @@ static int __init xencons_init(void)
 {
        int rc;
 
+       if (xen_init() < 0)
+               return -ENODEV;
+
        if (xc_mode == XC_OFF)
                return 0;
 

diff --git a/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c b/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c
index d0b1e641757d175749691f5d08f79a1b5e92e786..f3103092f181fc9bc57b464ddc9cdc18435e8d4d 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c
+++ b/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c
@@ -25,6 +25,8 @@
 #include <asm/pgtable.h>
 #include <asm/uaccess.h>
 #include <asm/tlb.h>
+#include <asm-xen/xen-public/xen.h>
+#include <asm/hypervisor.h>
 #include <asm-xen/linux-public/privcmd.h>
 #include <asm/hypervisor.h>
 #include <asm-xen/xen-public/xen.h>

diff --git a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c
index 6ace0c42b769189aed87aece1656ef99f69302bb..45ccdfa3be26416e9d3d4ac7b65ce3295c37506b 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c
@@ -43,6 +43,7 @@
 #include <asm/hypervisor.h>
 #include <asm-xen/xenbus.h>
 #include <asm-xen/xen_proc.h>
+#include <asm/hypervisor.h>
 #include <asm-xen/linux-public/xenstored.h>
 
 struct xenbus_dev_data {

diff --git a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
index c671d92ba06f1cb3f4f628a30ae9325c8237ca62..094d81870e76bd75e217446520699931f3d48d0e 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
@@ -674,6 +674,9 @@ int do_xenbus_probe(void *unused)
 
 static int __init xenbus_probe_init(void)
 {
+       if (xen_init() < 0)
+               return -ENODEV;
+
        bus_register(&xenbus_frontend.bus);
        bus_register(&xenbus_backend.bus);
        device_register(&xenbus_frontend.dev);

diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypervisor.h b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypervisor.h
index 9d766f8c3998d176cd37d2deeb0aad85d41b0c4b..55c8761913a5eb3c66ebd63517ca0c7c68e8dcae 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypervisor.h
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypervisor.h
@@ -140,6 +140,8 @@ void xen_destroy_contiguous_region(unsigned long vstart, unsigned int order);
 #define MULTI_UVMDOMID_INDEX 4
 #endif
 
+#define xen_init()     (0)
+
 static inline void
 MULTI_update_va_mapping(
     multicall_entry_t *mcl, unsigned long va,